motor-admin 0.1.103 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43a3f7d2e7af7a08e482f092dc5cd3e988f6f60e144f4dab98f76ea9ee7a2c7e
-  data.tar.gz: 23fdd15f65158da7db875355a79ef8059b7614ca21e870df76c5c1b171660f33
+  metadata.gz: f43566e0fd7cd93d18edae286ca0f138bba3ed0f0d531264d0ad29579f704306
+  data.tar.gz: e3b2860cd08bdad0eb465b71fb6963f53203117b11871a9b2ced77b086780376
 SHA512:
-  metadata.gz: b41c98a04acf728ded9f596740c3c900d448b4697eb2067cb2c518b41386dfc4a04fcb671360ef74e33a74c5fa6d4644ca62b62246597e9005781fd60a1a055e
-  data.tar.gz: b87007440e00347b58fda93b21121a683f1bfd9b263996b4681e39921510ea002184eee955878c19c7c81e6a121f800de2bacb0bffb9b1ace3eaa07b88ef87b3
+  metadata.gz: 8adc5697b41a7427c67e66b6024995431b630b787a41eacbed0501d2ccac8b815b10536eb7becf96dc7033ee76bdb49dc1decd481bcdaa95b2b7c8f75f50f96d
+  data.tar.gz: 0dfc8b287097a5ff8c9e0b640625b53eddaa1ea302f674caa65f9a5e044c49b073d9d0c932ba5ffc0e8986d66640216fce785b1bb85332f4c3173bccb575cdb3

data/README.md

@@ -49,6 +49,8 @@ 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)
+
 ### Custom Actions
 
 ![Custom actions](https://user-images.githubusercontent.com/5418788/119266132-3c1dd580-bbf2-11eb-9666-09e1640eaf7b.png)
@@ -75,8 +77,9 @@ end
 
 ![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/{resource_id}/apply`.<br>
-[Learn more about custom forms builder](https://github.com/omohokcoj/motor-admin/blob/master/guides/building_custom_forms.md).
+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)
 
 ### SQL Queries
 

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

@@ -5,6 +5,7 @@ module Motor
     extend ActiveSupport::Concern
 
     INSTANCE_VARIABLE_NAME = 'resource'
+    ASSOCIATION_INSTANCE_VARIABLE_NAME = 'associated_resource'
 
     included do
       before_action :load_and_authorize_resource
@@ -26,7 +27,7 @@ module Motor
     def load_and_authorize_resource
       options = {
         class: resource_class,
-        parent: false,
+        parent: params[:association].present?,
         instance_name: INSTANCE_VARIABLE_NAME
       }
 
@@ -57,7 +58,7 @@ module Motor
           parent: false,
           through: :resource,
           through_association: params[:association].to_sym,
-          instance_name: INSTANCE_VARIABLE_NAME
+          instance_name: params[:action] == 'create' ? ASSOCIATION_INSTANCE_VARIABLE_NAME : INSTANCE_VARIABLE_NAME
         ).load_and_authorize_resource
       else
         render json: { message: 'Unknown association' }, status: :not_found

data/app/controllers/motor/data_controller.rb

@@ -21,7 +21,19 @@ module Motor
     end
 
     def create
-      @resource.save!
+      if @associated_resource
+        if @resource_class.reflections[params[:association]].through_reflection?
+          @associated_resource.save!
+
+          @resource = @associated_resource
+        else
+          @resource.public_send(params[:association].to_sym).create!(@associated_resource.attributes) do |resource|
+            @resource = resource
+          end
+        end
+      else
+        @resource.save!
+      end
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params, current_ability) }
     rescue ActiveRecord::RecordInvalid
@@ -61,7 +73,7 @@ module Motor
 
     def resource_params
       if params[:data].present?
-        params.require(:data).except(resource_class.primary_key).permit!
+        params.require(:data).permit!
       else
         {}
       end

data/app/controllers/motor/ui_controller.rb

@@ -4,7 +4,9 @@ module Motor
   class UiController < ApplicationController
     layout 'motor/application'
 
-    helper_method :current_user, :current_ability
+    helper_method :current_user, :current_ability, :cache_keys
+
+    before_action :set_i18n_locale
 
     def index
       render_ui
@@ -27,5 +29,15 @@ module Motor
 
       render :show
     end
+
+    def set_i18n_locale
+      configs = Motor::Configs::LoadFromCache.load_configs(cache_key: cache_keys[:configs])
+
+      I18n.locale = configs.find { |c| c.key == 'language' }&.value || I18n.locale
+    end
+
+    def cache_keys
+      @cache_keys ||= Configs::LoadFromCache.load_cache_keys
+    end
   end
 end

data/app/mailers/motor/alerts_mailer.rb

@@ -26,7 +26,7 @@ module Motor
     end
 
     def from_address
-      from = ENV['MOTOR_ALERTS_FROM_ADDRESS'].presence
+      from = ENV['MOTOR_ALERTS_FROM_ADDRESS'].presence || ENV['MOTOR_EMAIL_ADDRESS'].presence
 
       from ||= application_mailer_default_from
       from ||= mailer_config_from_address

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

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

data/config/locales/en.yml

@@ -87,6 +87,7 @@ en:
     field_name: Field name
     field_value_does_not_match_pattern: '%{field} value does not match %{pattern}'
     file: File
+    filter: Filter
     filters: Filters
     form: Form
     form_has_been_saved: Form has been saved!
@@ -110,7 +111,7 @@ en:
     interval: Interval
     is: Is
     is_not: Is not
-    items_has_been_removed: items has been removed
+    items_have_been_removed: items have been removed
     items_will_be_removed: '%{count} items will be removed'
     json: JSON
     label: Currency
@@ -258,3 +259,6 @@ en:
     add_text: Add Text
     edit_text: Edit Text
     open_in_markdown_editor: Open in markdown editor
+    activate: Activate
+    load_existing_options_from_database: Load existing options from the database
+    add_database: Add Database

data/config/locales/es.yml

@@ -59,6 +59,7 @@ es:
     emails: Emails
     every_day_at_hh_mm: todos los días a las HH:mm PM...
     field_name: Nombre del campo
+    filter: Filtrar
     filters: Filtros
     form: Formulario
     form_has_been_saved: ¡Formulario guardado!
@@ -73,7 +74,7 @@ es:
     hello_admin: Hola Admin 👋
     input_type: Tipo de campo
     interval: Intervalo
-    items_has_been_removed: elementos fueron eliminados
+    items_have_been_removed: elementos fueron eliminados
     label: Moneda
     line_chart: Gráfico de líneas
     link_name: Nombre del link
@@ -258,6 +259,9 @@ es:
     add_text: Añadir Texto
     edit_text: Editar Texto
     open_in_markdown_editor: Abrir en el editor de markdown
+    activate: Activar
+    load_existing_options_from_database: Cargar las opciones existentes de la base de datos
+    add_database: Añadir base de datos
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -0,0 +1,345 @@
+pt:
+  motor:
+    action_has_been_applied: "A ação foi aplicada!"
+    action_has_failed_with_code: "A ação falhou com o código"
+    action_type: "Tipo de ação"
+    actions: "Ações"
+    add: "Adicionar"
+    add_action: "Adicionar ação"
+    add_alert: "Adicionar alerta"
+    add_association: "Adicionar associação"
+    add_column: "Adicionar Coluna"
+    add_dashboard: "Adicionar painel"
+    add_field: "Adicionar campo"
+    add_filter: "Adicionar filtro"
+    add_form: "Adicionar formulário"
+    add_group: "Adicionar grupo"
+    add_item: "Adicionar item"
+    add_link: "Adicionar link"
+    add_query: "Adicionar consulta"
+    add_scope: "Adicionar escopo"
+    add_tab: "Adicionar guia"
+    add_text: "Adicionar texto"
+    adjust_fields: "Ajustar campos"
+    adjust_form: "Ajustar formulário"
+    alert_email_has_been_sent: "E-mail de alerta foi enviado!"
+    alert_has_been_activated: "O alerta foi ativado"
+    alert_has_been_disabled: "O alerta foi desativado"
+    alert_has_been_saved: "O alerta foi salvo!"
+    alert_name: "Nome do alerta"
+    alerts: "Alertas"
+    all: "Todos"
+    all_resources: "Todos os recursos"
+    and: "e"
+    api: "API"
+    api_path: "Caminho da API"
+    api_request: "Solicitação de API"
+    apply: "Aplicar"
+    are_you_sure: "Tem certeza?"
+    associations: "Associações"
+    bar_chart: "Gráfico de barras"
+    base: "Base"
+    boolean: "Booleano"
+    build_custom_form: "Crie um formulário personalizado"
+    cancel: "Cancelar"
+    cents: "Centavos"
+    change: "Alterar"
+    chart: "Gráfico"
+    checkbox: "Caixa de seleção"
+    clear: "Limpar"
+    clear_all: "Limpar tudo"
+    clear_selection: "Limpar seleção"
+    close: "Fechar"
+    close_editor: "Fechar editor"
+    close_settings: "Fechar ajustes"
+    close_variables: "Fechar variáveis"
+    color: "Cor"
+    columns: "Colunas"
+    condition: "Condição"
+    conditional: "Condicional"
+    contains: "Contém"
+    copied_to_the_clipboard: "Copiado para a área de transferência"
+    create: "Criar"
+    create_new: "Criar novo"
+    currency: "Moeda"
+    current_user_variables_are_always_passed_explicitly_and_can_he_used_html: "<code>{{current_user_id}}</code> e <code>{{current_user_email}}</code> variáveis são sempre passadas explicitamente e podem ser usadas para decidir quais dados devem ser exibidos para determinado usuário:"
+    dashboard: "Painel"
+    dashboard_has_been_saved: "O painel foi salvo!"
+    dashboard_title: "Título do painel"
+    dashboards: "Painéis"
+    date: "Data"
+    date_and_time: "Data e hora"
+    decimal: "Decimal"
+    default: "Padrão"
+    default_value: "Valor predefinido"
+    describe_this_alert_optional: "Descreva este alerta (opcional)"
+    describe_your_dashboard_optional: "Descreva seu painel (opcional)"
+    describe_your_form_optional: "Descreva seu formulário (opcional)"
+    describe_your_query_optional: "Descreva sua consulta (opcional)"
+    description: "Descrição"
+    deselect_all: "Desmarcar tudo"
+    details: "Detalhes"
+    disable: "Desabilitar"
+    display_as: "Exibir como"
+    edit: "Editar"
+    edit_markdown: "Editar markdown"
+    edit_sql: "Editar SQL"
+    edit_text: "Editar texto"
+    emails: "E-mails"
+    empty: "Vazio"
+    ends_with: "Termina com"
+    equal_to: "É igual a"
+    every_day_at_hh_mm: "todos os dias em HH:mm PM..."
+    excludes: "exclui"
+    field: "Campo"
+    field_is_not_a_number: "% {field} não é um número"
+    field_is_required: "%{field} é obrigatório"
+    field_list_cant_be_empty: "A lista %{field} não pode estar vazia"
+    field_must_be_exactly_in_length: "%{field} deve ter exatamente %{length} de comprimento"
+    field_must_be_less_in_length: '%{field} deve ser menor que %{length} em comprimento'
+    field_must_be_more_in_length: '%{field} deve ter mais do que %{length} de comprimento'
+    field_name: "Nome do campo"
+    field_value_does_not_match_pattern: "%{field} valor não corresponde %{pattern}"
+    file: "Arquivo"
+    filters: "Filtros"
+    foreign_key: "Foreign key"
+    form: "Formulário"
+    form_has_been_saved: "O formulário foi salvo!"
+    form_has_been_submitted_successfully: "O formulário foi enviado com sucesso!"
+    form_name: "Nome do formulário"
+    forms: "Formulários"
+    funnel: "Funil"
+    general: "Geral"
+    greater_or_equal: "Maior ou igual"
+    greater_than: "Maior do que"
+    greater_than_or_equal_to: "Maior que ou igual a"
+    group_name: "Nome do grupo"
+    has_been_created: "foi criado"
+    has_been_removed_succesfully: "foi removido com sucesso"
+    has_been_updated: "foi atualizado"
+    hello_admin: "Olá Admin \U0001f44b"
+    hidden: "Oculto"
+    image: "Imagem"
+    includes: "Inclui"
+    input_type: "Tipo de entrada"
+    integer: "Integer"
+    interval: "Intervalo"
+    is: "É"
+    is_not: "Não é"
+    items_has_been_removed: "itens foram removidos"
+    items_will_be_removed: "%{count} itens serão removidos"
+    json: "JSON"
+    label: "Moeda"
+    less_or_equal: "Menor ou igual"
+    less_than: "Menor do que"
+    less_than_or_equal_to: "Menor ou igual a"
+    line_chart: "Gráfico de linhas"
+    link: "Link"
+    link_name: "Nome do link"
+    link_text: "Texto do link"
+    links: "Links"
+    load_initial_data: "Carregar dados iniciais"
+    loading: "Carregando…"
+    long_text: "Texto longo"
+    looks_like_you_are_new_here: "Parece que você é novo aqui \U0001f643"
+    markdown: "Markdown"
+    method: "Método"
+    method_call: "Chamada de método"
+    more: "Mais"
+    multiple: "Múltiplo"
+    name: "Nome"
+    new_alert: "Novo alerta"
+    new_dashboard: "Novo painel"
+    new_form: "Novo formulário"
+    new_query: "Nova consulta"
+    no_data: "Sem dados"
+    not_empty: "Não vazio"
+    not_found: "Não encontrado"
+    number: "Número"
+    ok: "Ok"
+    open_in_markdown_editor: "Abrir no editor de markdown"
+    options_separated_with_new_line_or_comma: "Opções separadas com nova linha ou vírgula"
+    or: "Ou"
+    other_than: "Outros que não"
+    param_name: "Nome do param"
+    password: "Senha"
+    path: "Caminho"
+    percent: "Porcento"
+    percentage: "Porcentagem"
+    pie_chart: "Gráfico de pizza"
+    polymorphic: "Polimórfico"
+    primary_key: "Chave primária"
+    queries: "Consultas"
+    queries_can_contain_variable_via_syntax_html: "As consultas podem conter variáveis incorporadas usando a sintaxe <code>{{variable}}</code>:"
+    query: "Consulta"
+    query_editor: "Editor de consultas"
+    query_has_been_saved: "A consulta foi salva!"
+    query_name: "Nome da consulta"
+    query_not_selected: "Consulta não selecionada"
+    query_revisions: "Revisões de consulta"
+    read_only: "Somente leitura"
+    read_write: "Leitura-gravação"
+    reference: "Referência"
+    reference_resource: "Recurso de referência"
+    remove: "Remover"
+    reports: "Relatórios"
+    request_param: "Param de solicitação"
+    required: "Requerido"
+    resource: "Recurso"
+    resource_filters: "%{resource} Filtros"
+    resource_settings: "%{resource} Configurações"
+    resources: "Recursos"
+    restore: "Restaurar"
+    resubmit: "Reenviar"
+    revert: "Reverter"
+    revision_has_been_applied: "A revisão foi aplicada"
+    revisions: "Revisões"
+    richtext: "Richtext"
+    row_chart: "Gráfico de linhas"
+    run: "Executar"
+    save: "Salvar"
+    save_and_create_new: "Salvar e criar novo"
+    save_as_new: "Salvar como novo"
+    save_dashboard: "Salvar painel"
+    save_form: "Salvar formulário"
+    save_query: "Salvar consulta"
+    scopes: "Escopos"
+    search: "Pesquisar"
+    search_placeholder: "Pesquisar..."
+    search_query: "Consulta de pesquisa"
+    select: "Selecionar"
+    select_alert_tags: "Selecionar tags de alerta"
+    select_dashboard: "Selecione o painel"
+    select_dashboard_tags: "Selecionar tags de painel"
+    select_form: "Selecionar formulário"
+    select_form_tags: "Selecionar tags de dashform"
+    select_options: "Selecionar opções"
+    select_placeholder: "Selecione..."
+    select_query: "Selecionar consulta"
+    select_query_tags: "Selecionar tags de consulta"
+    select_resource_placeholder: "Selecionar recurso..."
+    selected_item_has_been_removed: "O item selecionado foi removido"
+    selected_item_will_be_removed: "O item selecionado será removido"
+    selected_item_will_be_removed_are_you_sure: "O item selecionado será removido. Tem certeza?"
+    send_empty: "Enviar vazio?"
+    send_now: "Enviar agora"
+    send_to: "Enviar para"
+    set_tags: "Definir tags"
+    settings: "Configurações"
+    should_be_a_valid_json: "Deve ser um JSON válido"
+    should_be_error_constraint: "Deve ser %{erro} %{constraint}"
+    source: "Fonte"
+    stacked_bars: "Barras empilhadas"
+    starts_with: "Começa com"
+    submit: "Enviar"
+    syntax_is_used_for_if_and_if_not_conditions_html: "<code>{{#variable}}... {{/variable}}</code> e <code>{{^variable}}... A sintaxe {{variable}}</code> é usada para condições <code>if</code> e <code>se não</code>, respectivamente:"
+    tab_type: "Tipo de guia"
+    table: "Tabela"
+    tabs: "Guias"
+    tag: "Tag"
+    tags: "Tags"
+    text: "Texto"
+    textarea: "Área de texto"
+    there_are_unsaved_changes_from: "Há alterações não salvas de %{timestamp}"
+    through: "Através"
+    timezone: "Fuso horário"
+    title: "Título"
+    type: "Tipo"
+    unable_to_load_form_data: "Não é possível carregar dados do formulário"
+    unable_to_remove_item: "Não foi possível remover o item"
+    unable_to_remove_items: "Não foi possível remover itens"
+    unable_to_send_email: "Não foi possível enviar e-mail"
+    unable_to_submit_form: "Não foi possível enviar o formulário"
+    unit: "Unidade"
+    use_default: "Usar padrão"
+    value: "Valor"
+    values_axis: "Eixo valores"
+    variables: "Variáveis"
+    visibility: "Visibilidade"
+    visualization: "Visualização"
+    write_only: "Somente gravação"
+    i:
+      locale: pt
+      select:
+        placeholder: Selecionar
+        noMatch: Sem correspondências
+        loading: Carregando
+      table:
+        noDataText: Sem dados
+        noFilteredDataText: Sem dados para o filtro
+        confirmFilter: Aceitar
+        resetFilter: Resetar filtro
+        clearFilter: Limpar
+        sumText: Soma
+      datepicker:
+        selectDate: Selecionar data
+        selectTime: Selecionar hora
+        startTime: Horário de início
+        endTime: Horário de final
+        clear: Limpar
+        ok: Aceitar
+        datePanelLabel: "[mmmm] [yyyy]"
+        month: Mês
+        month1: Janeiro
+        month2: Fevereiro
+        month3: Março
+        month4: Abril
+        month5: Maio
+        month6: Junho
+        month7: Julho
+        month8: Agosto
+        month9: Setembro
+        month10: Outubro
+        month11: Novembro
+        month12: Dezembro
+        year: Ano
+        weekStartDay: '1'
+        weeks:
+          sun: Dom
+          mon: Seg
+          tue: Ter
+          wed: Qua
+          thu: Qui
+          fri: Sex
+          sat: Sab
+        months:
+          m1: Jan
+          m2: Fev
+          m3: Mar
+          m4: Abr
+          m5: Mai
+          m6: Jun
+          m7: Jul
+          m8: Ago
+          m9: Set
+          m10: Out
+          m11: Nov
+          m12: Dez
+      transfer:
+        titles:
+          source: Origem
+          target: Destino
+        filterPlaceholder: Buscar aqui
+        notFoundText: Sem resultados
+      modal:
+        okText: Aceitar
+        cancelText: Cancelar
+      poptip:
+        okText: Aceitar
+        cancelText: Cancelar
+      page:
+        prev: Página Anterior
+        next: Página Seguinte
+        total: Total
+        item: Elemento
+        items: Elementos
+        prev5: 5 Páginas Anteriores
+        next5: 5 Páginas Seguintes
+        page: "/page"
+        goto: Ir a
+        p: ''
+      rate:
+        star: Estrela
+        stars: Estrelas
+      tree:
+        emptyText: Sem Dados

data/config/routes.rb

@@ -21,7 +21,8 @@ Motor::Admin.routes.draw do
       resources :audits, only: %i[index]
       resources :resources, path: '/data/:resource',
                             only: %i[index show update create destroy],
-                            controller: 'data' do
+                            controller: 'data',
+                            constraints: { id: %r{[^/]+} } do
         put '/:method', to: 'data#execute'
         resources :association, path: '/:association',
                                 only: %i[index create],

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

@@ -143,6 +143,15 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
     add_index :motor_audits, %i[user_id user_type], name: 'motor_auditable_user_index'
     add_index :motor_audits, :request_uuid
     add_index :motor_audits, :created_at
+
+    model = Class.new(ApplicationRecord)
+
+    model.table_name = 'motor_configs'
+
+    model.create!(key: 'header.links', value: [{
+      name: '⭐ Star on GitHub',
+      path: 'https://github.com/omohokcoj/motor-admin'
+    }].to_json)
   end
 
   def self.down

data/lib/motor/active_record_utils/active_record_filter_patch.rb

@@ -14,5 +14,17 @@ if Rails::VERSION::MAJOR == 6
       build_filters(arel, my_alias_tracker)
       arel
     end
+
+    def build_filters(manager, alias_tracker)
+      where_clause = nil
+
+      @filters.each do |filters|
+        where_clause = filter_clause_factory.build(filters, alias_tracker)
+
+        manager.where(where_clause.ast)
+      end
+
+      @values[:where] = where_clause if where_clause
+    end
   end
 end

data/lib/motor/api_query/build_json.rb

@@ -92,7 +92,7 @@ module Motor
       def find_key_in_params(params, key)
         params = params['include']
 
-        return if params.blank?
+        return {} if params.blank?
         return params[key] if params[key]
 
         params.keys.reduce(nil) do |acc, k|

data/lib/motor/build_schema/load_from_rails.rb

@@ -22,9 +22,9 @@ module Motor
 
       def call
         models.map do |model|
-          Object.const_get(model.name)
+          model = Object.const_get(model.name)
 
-          next unless ActiveRecord::Base.connection.table_exists?(model.table_name)
+          next unless model.table_exists?
 
           schema = build_model_schema(model)
 
@@ -37,7 +37,7 @@ module Motor
           Rails.logger.error(e)
 
           next
-        end.compact
+        end.compact.uniq
       end
 
       def models
@@ -225,8 +225,8 @@ module Motor
           display_name: model.human_attribute_name(name),
           model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
           reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
-          foreign_key: reflection.foreign_key,
-          primary_key: reflection.polymorphic? ? 'id' : reflection.active_record_primary_key,
+          foreign_key: reflection.join_foreign_key,
+          primary_key: reflection.polymorphic? ? 'id' : reflection.join_primary_key,
           options: reflection.options.slice(:through, :source),
           polymorphic: reflection.polymorphic?,
           virtual: false
@@ -248,8 +248,8 @@ module Motor
             display_name: model.human_attribute_name(name),
             slug: name.underscore,
             model_name: model_class.name.underscore,
-            foreign_key: ref.foreign_key,
-            primary_key: ref.active_record_primary_key,
+            foreign_key: ref.join_primary_key,
+            primary_key: ref.join_foreign_key,
             polymorphic: ref.options[:as].present?,
             icon: Motor::FindIcon.call(name),
             options: ref.options.slice(:through, :source),
@@ -287,8 +287,6 @@ module Motor
           { includes: validator.send(:delimiter) }
         when ActiveRecord::Validations::PresenceValidator
           { required: true }
-        when ActiveModel::Validations::FormatValidator
-          { format: JsRegex.new(options[:with]).to_h.slice(:source, :options) }
         when ActiveRecord::Validations::LengthValidator
           { length: normalize_length_validation_options(options) }
         when ActiveModel::Validations::NumericalityValidator

data/lib/motor/build_schema/utils.rb

@@ -5,6 +5,7 @@ module Motor
     module Utils
       ABBREVIATIONS = {
         'Id' => 'ID',
+        'Uuid' => 'UUID',
         'Url' => 'URL',
         'Iso' => 'ISO',
         'vip' => 'VIP',

data/lib/motor/build_schema.rb

@@ -51,7 +51,11 @@ module Motor
     COLUMN_NAME_ACCESS_TYPES = {
       id: ColumnAccessTypes::READ_ONLY,
       created_at: ColumnAccessTypes::READ_ONLY,
+      created_on: ColumnAccessTypes::READ_ONLY,
+      inserted_at: ColumnAccessTypes::READ_ONLY,
       updated_at: ColumnAccessTypes::READ_ONLY,
+      updated_on: ColumnAccessTypes::READ_ONLY,
+      modified_at: ColumnAccessTypes::READ_ONLY,
       deleted_at: ColumnAccessTypes::READ_ONLY
     }.with_indifferent_access.freeze
 

data/lib/motor/configs/build_ui_app_tag.rb

@@ -12,9 +12,7 @@ module Motor
 
       module_function
 
-      def call(current_user = nil, current_ability = nil)
-        cache_keys = LoadFromCache.load_cache_keys
-
+      def call(current_user = nil, current_ability = nil, cache_keys: LoadFromCache.load_cache_keys)
         CACHE_STORE.fetch("#{I18n.locale}#{cache_keys.hash}#{current_user&.id}") do
           CACHE_STORE.clear
 
@@ -23,16 +21,19 @@ module Motor
         end
       end
 
+      # rubocop:disable Metrics/AbcSize
       # @return [Hash]
       def build_data(cache_keys = {}, current_user = nil, current_ability = nil)
         configs_cache_key = cache_keys[:configs]
 
         {
+          version: Motor::VERSION,
           current_user: current_user&.as_json(only: %i[id email]),
           current_rules: current_ability.serialized_rules,
           audits_count: Motor::Audit.count,
           i18n: i18n_data,
           base_path: Motor::Admin.routes.url_helpers.motor_path,
+          admin_settings_path: Rails.application.routes.url_helpers.try(:admin_settings_general_path),
           schema: Motor::BuildSchema.call(cache_keys, current_ability),
           header_links: header_links_data_hash(configs_cache_key),
           homepage_layout: homepage_layout_data_hash(configs_cache_key),
@@ -45,6 +46,7 @@ module Motor
           forms: forms_data_hash(build_cache_key(cache_keys, :forms, current_user, current_ability), current_ability)
         }
       end
+      # rubocop:enable Metrics/AbcSize
 
       def i18n_data
         I18n.t('motor', default: I18n.t('motor', locale: :en))

data/lib/motor/configs/sync_from_file.rb

@@ -3,7 +3,6 @@
 module Motor
   module Configs
     module SyncFromFile
-      FILE_PATH = Motor::Configs::FILE_PATH
       MUTEXT = Mutex.new
       FILE_TIMESTAMPS_STORE = ActiveSupport::Cache::MemoryStore.new(size: 1.megabyte)
 
@@ -11,7 +10,7 @@ module Motor
 
       def call(with_exception: false)
         MUTEXT.synchronize do
-          file = Rails.root.join(FILE_PATH)
+          file = Pathname.new(Motor::Configs.file_path)
 
           file_timestamp =
             begin

data/lib/motor/configs/write_to_file.rb

@@ -4,7 +4,6 @@ module Motor
   module Configs
     module WriteToFile
       THREAD_POOL = Concurrent::FixedThreadPool.new(1)
-      FILE_PATH = Motor::Configs::FILE_PATH
 
       module_function
 
@@ -22,7 +21,7 @@ module Motor
       end
 
       def write_with_lock
-        File.open(Rails.root.join(FILE_PATH), 'w') do |file|
+        File.open(Motor::Configs.file_path, 'w') do |file|
           file.flock(File::LOCK_EX)
 
           YAML.dump(Motor::Configs::BuildConfigsHash.call, file)

data/lib/motor/configs.rb

@@ -5,6 +5,19 @@ module Motor
     FILE_PATH = 'config/motor.yml'
     SYNC_API_PATH = '/motor_configs_sync'
     SYNC_ACCESS_KEY = ENV.fetch('MOTOR_SYNC_API_KEY', '')
+    MEMFS_PATH = '/__enclose_io_memfs__/'
+    PWD_FILE_NAME = 'motor-admin.yml'
+
+    module_function
+
+    # @return [String]
+    def file_path
+      if Rails.root.to_s.start_with?(MEMFS_PATH)
+        [ENV['PWD'], PWD_FILE_NAME].join('/')
+      else
+        Rails.root.join(FILE_PATH).to_s
+      end
+    end
   end
 end
 

data/lib/motor/queries/run_query.rb

@@ -63,15 +63,15 @@ module Motor
         result = nil
         statement = prepare_sql_statement(query, limit, variables_hash, filters)
 
-        ActiveRecord::Base.transaction do
+        connection_class.transaction do
           result =
-            case ActiveRecord::Base.connection.class.name
+            case connection_class.connection.class.name
             when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
-              PostgresqlExecQuery.call(ActiveRecord::Base.connection, statement)
+              PostgresqlExecQuery.call(connection_class.connection, statement)
             else
               statement = normalize_statement_for_sql(statement)
 
-              ActiveRecord::Base.connection.exec_query(*statement)
+              connection_class.connection.exec_query(*statement)
             end
 
           raise ActiveRecord::Rollback
@@ -172,6 +172,10 @@ module Motor
           acc[variable[:name]] ||= variables_hash[variable[:name]] || variable[:default_value]
         end
       end
+
+      def connection_class
+        defined?(ResourceRecord) ? ResourceRecord : ActiveRecord::Base
+      end
     end
   end
 end

data/lib/motor/resources/fetch_configured_model.rb

@@ -117,7 +117,7 @@ module Motor
 
       def define_belongs_to_reflection(klass, config)
         klass.belongs_to(config[:name].to_sym,
-                         class_name: config[:model_name].classify,
+                         class_name: config[:model_name]&.classify,
                          foreign_key: config[:foreign_key],
                          polymorphic: config[:polymorphic],
                          primary_key: config[:primary_key],
@@ -163,20 +163,29 @@ module Motor
 
       def define_associations(klass, config)
         config.fetch(:associations, []).each do |association|
-          is_virtual, is_polymorphic = association.values_at(:virtual, :polymorphic)
+          next unless association[:virtual]
 
-          next unless is_virtual
+          options = normalize_association_params(association)
 
-          options = association.slice(:foreign_key, :primary_key)
-          options[:class_name] = association[:model_name].classify
-          options[:as] = association[:foreign_key].delete_suffix('_id') if is_polymorphic
+          filters = options.delete(:filters)
 
-          options = options.merge(association[:options] || {})
-
-          klass.has_many(association[:name].to_sym, **options.symbolize_keys)
+          if filters.present?
+            klass.has_many(association[:name].to_sym, -> { filter(filters).tap(&:arel) }, **options.symbolize_keys)
+          else
+            klass.has_many(association[:name].to_sym, **options.symbolize_keys)
+          end
         end
       end
 
+      def normalize_association_params(params)
+        options = params.slice(:foreign_key, :primary_key).merge(dependent: :destroy)
+
+        options[:class_name] = params[:model_name].classify
+        options[:as] = params[:foreign_key].delete_suffix('_id') if params[:polymorphic]
+
+        options.merge(params[:options] || {})
+      end
+
       def maybe_fetch_from_cache(model, cache_key, miss_cache_block, postprocess_block)
         return miss_cache_block.call unless cache_key
 

data/lib/motor/version.rb

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

data/lib/motor.rb

@@ -4,7 +4,6 @@ require 'concurrent/executor/fixed_thread_pool'
 require 'concurrent/timer_task'
 require 'cancancan'
 require 'ar_lazy_preload'
-require 'js_regex'
 require 'fugit'
 require 'csv'
 require 'active_record/filter'

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-37390abd2976b4fd28f0.css.gz": "main-37390abd2976b4fd28f0.css.gz",
-  "main-37390abd2976b4fd28f0.js.LICENSE.txt": "main-37390abd2976b4fd28f0.js.LICENSE.txt",
-  "main-37390abd2976b4fd28f0.js.gz": "main-37390abd2976b4fd28f0.js.gz",
-  "main.css": "main-37390abd2976b4fd28f0.css",
-  "main.js": "main-37390abd2976b4fd28f0.js"
+  "main-5c903ff9235e54ac03f1.css.gz": "main-5c903ff9235e54ac03f1.css.gz",
+  "main-5c903ff9235e54ac03f1.js.LICENSE.txt": "main-5c903ff9235e54ac03f1.js.LICENSE.txt",
+  "main-5c903ff9235e54ac03f1.js.gz": "main-5c903ff9235e54ac03f1.js.gz",
+  "main.css": "main-5c903ff9235e54ac03f1.css",
+  "main.js": "main-5c903ff9235e54ac03f1.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.103
+  version: 0.2.2
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: js_regex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +152,7 @@ files:
 - app/views/motor/ui/show.html.erb
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/pt.yml
 - config/routes.rb
 - lib/generators/motor/install_generator.rb
 - lib/generators/motor/migration.rb
@@ -1536,8 +1523,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-37390abd2976b4fd28f0.css.gz
-- ui/dist/main-37390abd2976b4fd28f0.js.gz
+- ui/dist/main-5c903ff9235e54ac03f1.css.gz
+- ui/dist/main-5c903ff9235e54ac03f1.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: