avo 1.3.0 → 1.3.5.pre.1

data/app/packs/js/controllers/fields/simple_mde_controller.js

@@ -8,9 +8,18 @@ export default class extends Controller {
     return this.elementTarget.dataset.view
   }
 
+  get componentOptions() {
+    try {
+      return JSON.parse(this.elementTarget.dataset.componentOptions)
+    } catch (error) {
+      return {}
+    }
+  }
+
   connect() {
     const options = {
       element: this.elementTarget,
+      spellChecker: this.componentOptions.spell_checker,
     }
 
     if (this.view === 'show') {

data/app/packs/js/controllers/fields/trix_field_controller.js

@@ -0,0 +1,121 @@
+import 'trix'
+import { Controller } from 'stimulus'
+import { castBoolean } from '@/js/helpers/cast_boolean'
+
+export default class extends Controller {
+  static targets = ['editor', 'controller']
+
+  get resourceId() {
+    return this.controllerTarget.dataset.resourceId
+  }
+
+  get resourceName() {
+    return this.controllerTarget.dataset.resourceName
+  }
+
+  get attachmentKey() {
+    return this.controllerTarget.dataset.attachmentKey
+  }
+
+  get attachmentsDisabled() {
+    return castBoolean(this.controllerTarget.dataset.attachmentsDisabled)
+  }
+
+  get uploadUrl() {
+    return `${window.location.origin}${window.Avo.configuration.root_path}/avo_api/resources/${this.resourceName}/${this.resourceId}/attachments`
+  }
+
+  connect() {
+    if (this.attachmentsDisabled) {
+      // Remove the attachments button
+      this.controllerTarget.querySelector('.trix-button-group--file-tools').remove()
+    }
+
+    window.addEventListener('trix-file-accept', (event) => {
+      if (event.target === this.editorTarget) {
+        // Prevent file uploads for fields that have attachments disabled.
+        if (this.attachmentsDisabled) {
+          event.preventDefault()
+          window.toastr.warning('This field has attachments disabled.')
+
+          return
+        }
+
+        // Prevent file uploads for resources that haven't been saved yet.
+        if (this.resourceId === '') {
+          event.preventDefault()
+          window.toastr.warning("You can't upload files into the Trix editor until you save the resource.")
+
+          return
+        }
+
+        // Prevent file uploads for fields without an attachment key.
+        if (this.attachmentKey === '') {
+          event.preventDefault()
+          window.toastr.warning("You haven't set an <a href='https://google.com' class='!text-blue-700 underline'>attachment_key</a> to this Trix field.")
+        }
+      }
+    })
+
+    window.addEventListener('trix-attachment-add', (event) => {
+      if (event.target === this.editorTarget) {
+        if (event.attachment.file) {
+          this.uploadFileAttachment(event.attachment)
+        }
+      }
+    })
+  }
+
+  uploadFileAttachment(attachment) {
+    this.uploadFile(
+      attachment.file,
+      (progress) => attachment.setUploadProgress(progress),
+      (attributes) => attachment.setAttributes(attributes),
+    )
+  }
+
+  uploadFile(file, progressCallback, successCallback) {
+    const formData = this.createFormData(file)
+    const xhr = new XMLHttpRequest()
+
+    xhr.open('POST', this.uploadUrl, true)
+
+    xhr.setRequestHeader('X-CSRF-Token', document.querySelector('meta[name="csrf-token"]').content)
+
+    xhr.upload.addEventListener('progress', (event) => {
+      // eslint-disable-next-line no-mixed-operators
+      const progress = event.loaded / event.total * 100
+      progressCallback(progress)
+    })
+
+    xhr.addEventListener('load', () => {
+      if (xhr.status === 200) {
+        let response
+        try {
+          response = JSON.parse(xhr.response)
+        } catch (error) {
+          response = {}
+        }
+
+        const attributes = {
+          url: response.url,
+          href: response.href,
+        }
+
+        successCallback(attributes)
+      }
+    })
+
+    xhr.send(formData)
+  }
+
+  createFormData(file) {
+    const data = new FormData()
+    data.append('Content-Type', file.type)
+    data.append('file', file)
+    data.append('filename', file.name)
+    data.append('attachment_key', this.attachmentKey)
+
+    return data
+  }
+}

data/app/views/avo/partials/_javascript.html.erb

@@ -1,3 +1,5 @@
 <%= javascript_tag nonce: true do %>
-  var timezone = '<%= Avo.configuration.timezone %>';
+  window.Avo = window.Avo || { configuration: {} }
+  Avo.configuration.timezone = '<%= Avo.configuration.timezone %>'
+  Avo.configuration.root_path = '<%= Avo.configuration.root_path %>'
 <% end %>

data/config/routes.rb

@@ -3,6 +3,10 @@ Avo::Engine.routes.draw do
 
   get "resources", to: redirect("/avo")
 
+  scope "avo_api", as: "avo_api" do
+    post "/resources/:resource_name/:id/attachments/", to: "attachments#create"
+  end
+
   scope "resources", as: "resources" do
     # Attachments
     get "/:resource_name/:id/active_storage_attachments/:attachment_name/:signed_attachment_id", to: "attachments#show"

data/lib/avo.rb

@@ -27,7 +27,7 @@ module Avo
         root_path: ROOT_PATH,
         public_output_dir: "avo-packs",
         cache_manifest: Rails.env.production?,
-        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT || Rails.env.test?}
+        fallback_to_webpacker: -> { Avo::IN_DEVELOPMENT || Rails.env.test? }
       )
     end
   end

data/lib/avo/fields/base_field.rb

@@ -33,6 +33,7 @@ module Avo
       attr_accessor :meta
       attr_accessor :panel_name
       attr_accessor :link_to_resource
+      attr_accessor :options
 
       class_attribute :field_name_attribute
 
@@ -67,7 +68,8 @@ module Avo
           default: nil,
           visible: true,
           meta: {},
-          panel_name: nil
+          panel_name: nil,
+          options: {}
         }
 
         # Set the values in the following order

data/lib/avo/fields/key_value_field.rb

@@ -3,6 +3,11 @@ require "json"
 module Avo
   module Fields
     class KeyValueField < BaseField
+      attr_reader :key_label
+      attr_reader :value_label
+      attr_reader :action_text
+      attr_reader :disable_adding_rows
+
       def initialize(name, **args, &block)
         @defaults = {
           partial_name: "key-value-field"
@@ -33,7 +38,13 @@ module Avo
         [:"#{id}", "#{id}": {}]
       end
 
-      def hydrate_field(fields, model, resource, view)
+      def parsed_value
+        value.to_json
+      rescue
+        {}
+      end
+
+      def options
         {
           key_label: @key_label,
           value_label: @value_label,
@@ -44,6 +55,18 @@ module Avo
           disable_deleting_rows: @disable_deleting_rows
         }
       end
+
+      def fill_field(model, key, value)
+        begin
+          new_value = JSON.parse(value)
+        rescue
+          new_value = {}
+        end
+
+        model[key] = new_value
+
+        model
+      end
     end
   end
 end

data/lib/avo/fields/markdown_field.rb

@@ -12,10 +12,9 @@ module Avo
 
         @always_show = args[:always_show].present? ? args[:always_show] : false
         @height = args[:height].present? ? args[:height].to_s : "auto"
-      end
-
-      def hydrate_field(fields, model, resource, view)
-        {
+        @spell_checker = args[:spell_checker].present? ? args[:spell_checker] : false
+        @options = {
+          spell_checker: @spell_checker,
           always_show: @always_show,
           height: @height
         }

data/lib/avo/fields/trix_field.rb

@@ -2,6 +2,8 @@ module Avo
   module Fields
     class TrixField < BaseField
       attr_reader :always_show
+      attr_reader :attachments_disabled
+      attr_reader :attachment_key
 
       def initialize(name, **args, &block)
         @defaults = {
@@ -13,6 +15,8 @@ module Avo
         hide_on :index
 
         @always_show = args[:always_show].present? ? args[:always_show] : false
+        @attachments_disabled = args[:attachments_disabled].present? ? args[:attachments_disabled] : false
+        @attachment_key = args[:attachment_key].present? ? args[:attachment_key] : nil
       end
     end
   end

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.3.0"
+  VERSION = "1.3.5.pre.1"
 end

data/lib/generators/avo/action_generator.rb

@@ -7,7 +7,7 @@ module Generators
       namespace "avo:action"
 
       def create_resource_file
-        template "action.rb", "app/avo/actions/#{singular_name}.rb"
+        template "action.tt", "app/avo/actions/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/avo/locales_generator.rb

@@ -6,10 +6,10 @@ module Generators
       source_root File.expand_path("templates", __dir__)
 
       namespace "avo:locales"
-      desc "Creates an Avo initializer adds the route to the routes file."
+      desc "Add Avo locale files to your project."
 
       def create_files
-        template "locales/avo.en.yml", "config/locales/avo.en.yml"
+        directory File.join(__dir__, "templates", "locales"), "config/locales"
       end
     end
   end

data/lib/generators/avo/templates/action.tt

@@ -1,13 +1,9 @@
-module Avo
-  module Actions
-    class <%= class_name.camelize %> < Action
-      self.name = '<%= name.underscore.humanize %>'
+class <%= class_name.camelize %> < Avo::BaseAction
+  self.name = '<%= name.underscore.humanize %>'
 
-      def handle(models:, fields:)
-        models.each do |model|
-          # Do something with your models.
-        end
-      end
+  def handle(models:, fields:)
+    models.each do |model|
+      # Do something with your models.
     end
   end
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -59,6 +59,7 @@ en:
     and_x_other_resources: 'and %{count} other resources'
     go_back: 'Go back'
     home: 'Home'
+    new: 'new'
     attach_item: 'Attach %{item}'
     choose_item: 'Choose %{item}'
     create_new_item: 'Create new %{item}'

data/lib/generators/avo/templates/locales/avo.nb-NO.yml

@@ -0,0 +1,81 @@
+nb:
+  avo:
+    dashboard: 'Dashboard'
+    choose_a_country: 'Velg et land'
+    choose_an_option: 'Velg et alternativ'
+    are_you_sure_you_want_to_run_this_option: 'Er du sikker?'
+    are_you_sure_detach_item: 'Er du sikker på at du vil koble fra %{item}.'
+    run: 'Kjør'
+    cancel: 'Avslutt'
+    action_ran_successfully: 'Suksess!'
+    resource_details: "%{item} detaljer: %{title}"
+    update_item: 'Oppdatert %{item}: %{title}'
+    unauthorized: 'Ikke autorisert'
+    attachment_class_attached: '%{attachment_class} lagt til.'
+    attachment_class_detached: '%{attachment_class} fjernet.'
+    resource_updated: 'Ressurs oppdatert'
+    resource_created: 'Ressurs generert'
+    resource_destroyed: 'Ressurs slettet'
+    switch_to_view: "Bytt til %{view_type} vis"
+    click_to_reveal_filters: "Vis filter"
+    attachment_destroyed: 'Vedlett slettet'
+    failed_to_find_attachment: 'Fant ikke vedlegg'
+    you_missed_something_check_form: 'Her mangler du noe. Vennligst sjekk skjemaet.'
+    remove_selection: 'Fjern valg'
+    select_item: 'Velg'
+    delete_file: 'Slett fil'
+    delete: 'slett'
+    delete_item: 'Slett %{item}'
+    download_item: 'Last ned %{item}'
+    download_file: 'Last ned fil'
+    download: 'Last ned'
+    view: 'Vis'
+    view_item: 'vis %{item}'
+    edit: 'endre'
+    edit_item: 'endre %{item}'
+    detach_item: 'koble fra %{item}'
+    number_of_items:
+      zero: 'ingen %{item}'
+      one: 'en %{item}'
+      other: '%{count} %{item}'
+    are_you_sure: 'Er du sikker?'
+    filters: 'Filter'
+    per_page: 'Per side'
+    more: 'Mer'
+    attach: 'Legg til'
+    cancel: 'Avslutt'
+    save: 'Lagre'
+    attach_and_attach_another: 'Legg til & Legg til ny'
+    hide_content: 'Skjul innhold'
+    show_content: 'Vis innhold'
+    no_related_item_found: 'Ingen relaterte %{item} funnet'
+    no_item_found: 'Ingen %{item} funnet'
+    loading: 'Laster'
+    confirm: 'Bekreft'
+    actions: 'Handlinger'
+    resources: 'Ressurser'
+    oops_nothing_found: 'Oops! Ingen ting funnet...'
+    type_to_search: 'Søk.'
+    and_x_other_resources: 'og %{count} andre ressurser'
+    go_back: 'Gå tilbake'
+    home: 'Hjem'
+    attach_item: 'Legg til %{item}'
+    choose_item: 'Velge %{item}'
+    create_new_item: 'Lag ny %{item}'
+    table_view: 'Tabell visning'
+    grid_view: 'Grid visning'
+    next_page: 'Neste side'
+    prev_page: 'Forrige side'
+    list_is_empty: 'Listen er tom'
+    field_translations:
+      file:
+        zero: 'filer'
+        one: 'fil'
+        other: 'filer'
+    resource_translations:
+      user:
+        zero: 'brukere'
+        one: 'bruker'
+        other: 'brukere'
+    reset_filters: 'Nullstill filter'
+    not_authorized: 'Du er ikke autorisert til å gjøre denne handlingen.'

data/lib/generators/avo/templates/locales/avo.pt-BR.yml

@@ -0,0 +1,82 @@
+pt:
+  avo:
+    dashboard: 'Painel'
+    choose_a_country: 'Escolha um país'
+    choose_an_option: 'Escolha uma opção'
+    are_you_sure_you_want_to_run_this_option: 'Você tem certeza que deseja executar esta ação?'
+    are_you_sure_detach_item: 'Você tem certeza que deseja separar este %{item}.'
+    run: 'Executar'
+    cancel: 'Cancelar'
+    action_ran_successfully: 'Ação executada com sucesso!'
+    resource_details: "Detalhe %{item}: %{title}"
+    update_item: 'atualizar %{item}: %{title}'
+    unauthorized: 'Não autorizado'
+    attachment_class_attached: '%{attachment_class} anexado.'
+    attachment_class_detached: '%{attachment_class} separado.'
+    resource_updated: 'Recurso atualizado'
+    resource_created: 'Recurso criado'
+    resource_destroyed: 'Recurso destruído'
+    switch_to_view: "Alterar para visão %{view_type}"
+    click_to_reveal_filters: "Clique para revelar os filtros"
+    attachment_destroyed: 'Anexo destruído'
+    failed_to_find_attachment: 'Falhou ao achar anexo'
+    you_missed_something_check_form: 'Você pode ter esquecido algo. Por favor, cheque o formulário.'
+    remove_selection: 'Remover seleção'
+    select_item: 'Selecionar item'
+    delete_file: 'Deletar arquivo'
+    delete: 'deletar'
+    delete_item: 'Deletar %{item}'
+    download_item: 'Baixar %{item}'
+    download_file: 'Baixar arquivo'
+    download: 'Baixar'
+    view: 'Visualizar'
+    view_item: 'visualizar %{item}'
+    edit: 'editar'
+    edit_item: 'editar %{item}'
+    detach_item: 'separar %{item}'
+    number_of_items:
+      zero: 'sem %{item}'
+      one: 'um %{item}'
+      other: '%{count} %{item}'
+    are_you_sure: 'Você tem certeza?'
+    filters: 'Filtros'
+    per_page: 'Por página'
+    more: 'Mais'
+    attach: 'Anexar'
+    cancel: 'Cancelar'
+    save: 'Salvar'
+    attach_and_attach_another: 'Anexar & anexar outro'
+    hide_content: 'Esconder conteúdo'
+    show_content: 'Mostrar conteúdo'
+    no_related_item_found: 'Nenhum %{item} relacionado encontrado'
+    no_item_found: 'Nenhum %{item} encontrado'
+    loading: 'Carregando'
+    confirm: 'Confirmar'
+    actions: 'Ações'
+    resources: 'Recursos'
+    oops_nothing_found: 'Oops! Nada encontrado...'
+    type_to_search: 'Digite para buscar.'
+    and_x_other_resources: 'e %{count} outros recursos'
+    go_back: 'Voltar'
+    home: 'Início'
+    new: 'novo'
+    attach_item: 'Anexar %{item}'
+    choose_item: 'Escolher %{item}'
+    create_new_item: 'Criar novo %{item}'
+    table_view: 'Visualização em tabela'
+    grid_view: 'Visualização em grade'
+    next_page: 'Próxima página'
+    prev_page: 'Página anterior'
+    list_is_empty: 'Lista vazia'
+    field_translations:
+      file:
+        zero: 'arquivos'
+        one: 'arquivo'
+        other: 'arquivos'
+    resource_translations:
+      user:
+        zero: 'usuários'
+        one: 'usuário'
+        other: 'usuários'
+    reset_filters: 'Limpar filtros'
+    not_authorized: 'Você não está autorizado à executar essa ação.'